ci: Bump to f28, except flatpak

We successfully switched to F28 in rpm-ostree. Time to follow suit here.
We exclude flatpak for now since we're still hitting test issues there
on F28.

Closes: #1601
Approved by: cgwalters

diff --git a/.papr-ex.yaml b/.papr-ex.yaml
index 900aae7ba7714b9f8cf678d9b8824dccc53d16fa..e4370fcfe9af99827b9422f5649f43747095598f 100644 (file)
--- a/.papr-ex.yaml
+++ b/.papr-ex.yaml
@@ -4,15 +4,15 @@ branches:
     - auto
     - try
 
-context: FAH27-insttests
+context: FAH28-insttests
 required: true
 
 container:
-  image: registry.fedoraproject.org/fedora:27
+  image: registry.fedoraproject.org/fedora:28
   kvm: true
 
 tests:
-  - ci/fah27-insttests.sh
+  - ci/fah28-insttests.sh
 
 artifacts:
   - tests/installed/artifacts/
@@ -27,8 +27,8 @@ branches:
     - try
 required: true
 container:
-  image: registry.fedoraproject.org/fedora:27
-context: f27-primary
+  image: registry.fedoraproject.org/fedora:28
+context: f28-primary
 env:
   # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
   CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@@ -51,10 +51,10 @@ artifacts:
 ---
 # And now the contexts below here are variant container builds
 
-context: f27-rust
+context: f28-rust
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:27
+    image: registry.fedoraproject.org/fedora:28
 env:
   CONFIGOPTS: '--enable-rust'
   CI_PKGS: cargo
@@ -65,10 +65,10 @@ tests:
 
 ---
 
-context: f27-gnutls
+context: f28-gnutls
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:27
+    image: registry.fedoraproject.org/fedora:28
 env:
   CONFIGOPTS: '--with-crypto=gnutls'
   CI_PKGS: pkgconfig(gnutls)
@@ -81,7 +81,7 @@ tests:
 
 inherit: true
 
-context: f27-experimental-api
+context: f28-experimental-api
 env:
   CONFIGOPTS: '--enable-experimental-api'
 
@@ -92,7 +92,7 @@ tests:
 
 inherit: true
 
-context: f27-minimal
+context: f28-minimal
 env:
   CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
    --disable-rust --without-libarchive --without-selinux --without-smack
@@ -107,7 +107,7 @@ tests:
 inherit: true
 required: true
 
-context: f27-libsoup
+context: f28-libsoup
 
 env:
   CONFIGOPTS: "--without-curl --without-openssl --with-libsoup"
@@ -120,7 +120,7 @@ tests:
 inherit: true
 required: true
 
-context: f27-introspection-tests
+context: f28-introspection-tests
 
 env:
     # ASAN conflicts with introspection testing;

diff --git a/.papr.yml b/.papr.yml
index 2d3dfe5ebd9e2522fa6d1be332a719428c2e32cf..7e6d6ce863bd6f2074bfd9da5f7183cf67d5d68d 100644 (file)
--- a/.papr.yml
+++ b/.papr.yml
@@ -4,20 +4,20 @@ branches:
     - auto
     - try
 
-context: FAH27-insttests
+context: FAH28-insttests
 required: true
 
 # FIXME; temporary workaround
 # https://github.com/ostreedev/ostree/pull/1513#issuecomment-378784162
 host:
-  distro: fedora/27/atomic
+  distro: fedora/28/atomic
   specs:
     ram: 4096
 #container:
-#  image: registry.fedoraproject.org/fedora:27
+#  image: registry.fedoraproject.org/fedora:28
 
 tests:
-  - docker run --device /dev/kvm --rm -v $(pwd):/srv/code:z registry.fedoraproject.org/fedora:27 /bin/sh -c "cd /srv/code && ./ci/fah27-insttests.sh"
+  - docker run --device /dev/kvm --rm -v $(pwd):/srv/code:z registry.fedoraproject.org/fedora:28 /bin/sh -c "cd /srv/code && ./ci/fah28-insttests.sh"
 
 artifacts:
   - tests/installed/artifacts/
@@ -32,8 +32,8 @@ branches:
     - try
 required: true
 container:
-  image: registry.fedoraproject.org/fedora:27
-context: f27-primary
+  image: registry.fedoraproject.org/fedora:28
+context: f28-primary
 env:
   # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
   CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@@ -56,10 +56,10 @@ artifacts:
 ---
 # And now the contexts below here are variant container builds
 
-context: f27-rust
+context: f28-rust
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:27
+    image: registry.fedoraproject.org/fedora:28
 env:
   CONFIGOPTS: '--enable-rust'
   CI_PKGS: cargo
@@ -70,10 +70,10 @@ tests:
 
 ---
 
-context: f27-gnutls
+context: f28-gnutls
 inherit: true
 container:
-    image: registry.fedoraproject.org/fedora:27
+    image: registry.fedoraproject.org/fedora:28
 env:
   CONFIGOPTS: '--with-crypto=gnutls'
   CI_PKGS: pkgconfig(gnutls)
@@ -86,7 +86,7 @@ tests:
 
 inherit: true
 
-context: f27-experimental-api
+context: f28-experimental-api
 env:
   CONFIGOPTS: '--enable-experimental-api'
 
@@ -97,7 +97,7 @@ tests:
 
 inherit: true
 
-context: f27-minimal
+context: f28-minimal
 env:
   CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
    --disable-rust --without-libarchive --without-selinux --without-smack
@@ -112,7 +112,7 @@ tests:
 inherit: true
 required: true
 
-context: f27-libsoup
+context: f28-libsoup
 
 env:
   CONFIGOPTS: "--without-curl --without-openssl --with-libsoup"
@@ -125,7 +125,7 @@ tests:
 inherit: true
 required: true
 
-context: f27-introspection-tests
+context: f28-introspection-tests
 
 env:
     # ASAN conflicts with introspection testing;
@@ -172,15 +172,15 @@ branches:
     - auto
     - try
 
-context: f27-rpmostree
+context: f28-rpmostree
 required: true
 
 cluster:
   hosts:
     - name: vmcheck
-      distro: fedora/27/atomic
+      distro: fedora/28/atomic
   container:
-    image: registry.fedoraproject.org/fedora:27
+    image: registry.fedoraproject.org/fedora:28
 
 env:
   HOSTS: vmcheck

diff --git a/ci/build-check.sh b/ci/build-check.sh
index c09e9a52339db21fb3c276db01151f41b39d32e5..ed129c74d160a80afd331f96b64bb6e1cabc3bc5 100755 (executable)
--- a/ci/build-check.sh
+++ b/ci/build-check.sh
@@ -22,11 +22,15 @@ make install
 # job than gcc for vars with cleanups; perhaps in the future these could
 # parallelize
 if test -x /usr/bin/clang; then
+    if grep -q -e 'static inline.*_GLIB_AUTOPTR_LIST_FUNC_NAME' /usr/include/glib-2.0/glib/gmacros.h; then
+        echo 'Skipping clang check, see https://bugzilla.gnome.org/show_bug.cgi?id=796346'
+    else
     # Except for clang-4.0: error: argument unused during compilation: '-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1' [-Werror,-Wunused-command-line-argument]
     export CFLAGS="-Wall -Werror -Wno-error=unused-command-line-argument ${CFLAGS:-}"
     git clean -dfx && git submodule foreach git clean -dfx
     export CC=clang
     build
+    fi
 fi
 
 copy_out_gdtr_artifacts() {

diff --git a/ci/fah27-insttests.sh b/ci/fah27-insttests.sh
deleted file mode 100755 (executable)
index a045cf5..0000000
--- a/ci/fah27-insttests.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-set -xeuo pipefail
-
-./tests/installed/provision.sh
-# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
-cd tests/installed
-curl -Lo fedora-atomic-host.qcow2 https://getfedora.org/atomic_qcow2_latest
-exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh

diff --git a/ci/fah28-insttests.sh b/ci/fah28-insttests.sh
new file mode 100755 (executable)
index 0000000..a045cf5
--- /dev/null
+++ b/ci/fah28-insttests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+set -xeuo pipefail
+
+./tests/installed/provision.sh
+# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
+cd tests/installed
+curl -Lo fedora-atomic-host.qcow2 https://getfedora.org/atomic_qcow2_latest
+exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh

diff --git a/ci/rpmostree.sh b/ci/rpmostree.sh
index e8189c40785ca4874a83c4c123f5bd944e08f44f..f766a368325cb3b8b1ea4ab54917ad01f5b61107 100755 (executable)
--- a/ci/rpmostree.sh
+++ b/ci/rpmostree.sh
@@ -6,7 +6,7 @@ set -xeuo pipefail
 # Frozen to a tag for now to help predictability; it's
 # also useful to test building *older* versions since
 # that must work.
-RPMOSTREE_TAG=v2017.11
+RPMOSTREE_TAG=v2018.5
 
 dn=$(dirname $0)
 . ${dn}/libpaprci/libbuild.sh
@@ -21,7 +21,7 @@ pkg_install rpm-ostree && rpm -e rpm-ostree
 # Duplicate of deps from build.sh in rpm-ostree for tests
 pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq PyYAML \
             libubsan libasan libtsan elfutils fuse sudo python-gobject-base \
-            selinux-policy-devel selinux-policy-targeted
+            selinux-policy-devel selinux-policy-targeted openssh-clients ansible
 # This one is in the papr.yml
 pkg_install rsync
 
@@ -38,6 +38,7 @@ build
 # We want to capture automake results
 cleanup() {
     mv test-suite.log ${codedir} || true
+    mv vmcheck ${codedir} || true
 }
 trap cleanup EXIT
 make -j 8 check